Fix code up against the latest changes in master.