Minor Changes to make project in Eclipse work again