Tidied up a couple of warnings.