Avoided a couple of obscure gcc warnings