Fixes & Improvements (4)