Fix type conversions
Fix type conversions.