Number-is-single fixes