Fixes to selected service areas