Fixing some warnings.
Merging changes.