Build fix for a previous merge errors