Tidied up a few warnings.