Changes to patch 1.2 control flow