various fixes to make run
Fixes to run