Change more castings from Double to Number