Cleared some more warnings.