Removed even more warnings.