Fixes and Improvements (5)