misc fixes to run with npm install