Fixes to work with engine updates