Small fixes to custom area codes