minimal runtime error fixes to load in sprint 27. does not fix functionality.