Fixups in Eclipse project, take 2