More tweaks to field output handling