Some tweaks to the clerk speech stuff