Fixes & Improvements (3)