Adding check for unexpected case of zone barging.
Adding some missing headers revealed by separate compilation.