Switch to using number formatter in some cases