bb6082 - Fix compiler warnings