Fixed build errors remaining after merge branch