Non-unified build fixes, late September 2020 edition