Fixes and Improvements (3)