Small fixes & tidy up