Changes to work in Eclipse again