Few more minor compiler warnings and code clean up.