Some reassignment fixes.