Fixes to make it run easier