Reinout hhnk fixes