Improvements to the gperf flow