Fixes for 9169, 8975