Fix breakage introduced in latest commits