Minor tweaks for ol6/SA406