Build fix (stuff that were removed in previous merge)