Fix build after merge

Fix stuffs