Some compiler warnings fixed
Cleanup