Fixes for 14119