Tidied up warnings