Modifications necessary for project ot build after merging preview code