Fixing number issues