More fixes. At least, satisfies Eclipse.