Refresh fix
Number format fixes