Two Rob micro bugs and a tidy up
For those who like completness