Number-is-single fixes

Couple of extra fixes after yesterdays merge action.