Minor tweaks to wall segment code