Fixed build errors due to changed interfaces.