Minor tweaks for correctness