Correct a couple of warnings