Eclipse build fix

Fix a couple of issues that appeared after merging #985