Fix some double->float conversions.
Merge pull request #1521 from RachelBryk/double

Fix some double->float conversions.