Couple of fixes

Sure hope my wife doesn't see this pull request!

Cheers,
  Lee :beers: