More tweaks for available-fields.