Minor fixes to follow SMURF principles