More fixes for #2391