Tidy up minor bugs