Cleanup fix and base directory for out