Fix regressions introduced in 3a5eb87965b60a3e249a16dc48cb06f4759dfb1b