Updates due to moving to Eclipse Luna