Fixing eclipse issues