Fix build after merge