Fixing some pedantic warnings