Fixes for commerce workflow