Fixes for r38424: