minor correctness fixes