Tweaks to frontage ordering code