More Tweaks and Fixes to Reassignment