Move the Bungee check to after gate layout check