Removed a few pedantic warnings.