#869 area maintenance tweaks