Fix missed conversions