Align to various recent changes