Squashing more warnings