Fixing pedantic warnings