Misc fixes related to recent features