Fixes for CSCul59253, CSCul58826