More correctness updates