small fixes for #5320