Minor tweaks

Tweaks realised by Nidhi Gupta based on feedback JurgenG