More warning squashing