Boot the underground lab.
Make some of the skybox buildings in the outside have a basement or something, so theres a point of going there instead of using it as awful eye-candy.
Switch up the exits from city, a couple should typically be guarded by CP at all times, with one, maybe two...