Fixes for Clean script