More fixes for #1529