Tidy up small fixes