Fixed build errors after the merge