Fixing and cleanup