Final fixes after re-cloning project and reopening it in Eclipse