Bugfixes in change set