Some tidying up after move to Eclipse Luna