Tidied up some warnings