Fixes for 9316, 9318