- Fixed number format bugs