More minor fixes to make the sample work again after engine refactor