Rationalised some defaults