fixes for consistency as per IW