Minor fixes to update the branch to Eclipse Luna