Fixes to get running