Further changes requested by RB

Would you like to do the honours @rowanbeentje?