Some more fixes for pedantic warnings.