More fixes for #2549