Bugfixes to StrFromNumber
Merge branch 'fix'