Updated packages.

Fixed issues with the merge.