Fix some warning glitches