Tidy up a couple of warnings