Cleaned up warnings.