Fixes for runs
Fix runtime errors