more fixes for #2318