Fixed few things broken by the cherrypicks