fixes to make suite just run again