Fixing address requirements