Fixes to combination system