Reinout small fixes