Fixes to clean properly