Some fixes for working on physical clusters