Tidying up a couple of warnings