Fixes for r61911: