a few more tweaks to the official converter