Reinout last fixes for monday