Fixed build errors from merge.