Fixes and Cleans