more eclipse fixes