Fixes compile warning.
Fixes some compile time warnings.
Fixes compile time warnings. A bit of code cleanup.