Cleaned up warnings.
Merge