small fixes to get this to run