Fixes to make it run