More fixes for #1252