Fixed some issues with updated dependencies.