Fix issues with AnvilCleaner not completing from command line