Bugfixes, so project can be compiled again