Fixes for 10186, 10187, 10168, 10167