Fixes for r64708: