Made adjustments for recent code changes.