Bug Fixes

* Some type casting fixes to take care of compiler warnings