Fixes for progression logic