Fixes for 9282, 9298, 9319