WBL: Some more adaptations for Daniël