Made changes required by library interface changes.