Add some helpful switches