Fixed build errors due to changes in dependencies.