Minor changes (after Eclipse-opcalypse)