Fix pedantic warnings