Tidy up of obvious errors