prepare fixes for intermittent failures for landing