Small fixes to reduce coversions