Fixed build errors after merge