Removing some more warnings.