Bugfixes included