Code review fixes
Minor tweaks to Border Village and Farmland pull