Warnings tidied up