Fixed some pedantic warnings