small fixes to make it run