Fixes for problems in koen kepler branch

After importing koen's kepler branch in my eclipse it still has some compilation errors. This pull request contains fixes for those errors