Fix some more pedantic warnings