Fixed some pedantic warnings.