Fixed build errors contained in the merge