more fixes to get things up and running