Made a few changes to run in Eclipse Luna