more eclipse warnings corrected