Suggested fixes
More conversions