v8.60 more fixes for eclipse warnings