Some fixes to make it easier to setup