Corridors fixed... mostly