Fix block assignments.