Additional converter tweaks (untested)