More fixes for #1620