Commission Bugfixes