Fixed a bits and bobs