Fixes for the commissions bugs