More int->double fixes