Fixes for layouts and services in rookeries.