Minor fixes to get it up and running