Small fixes to make it run