Fix build errors after merge