More misc fixes for #1034