More fixes for #1451