Code cleanup.
Removed some warnings.