Updated to new dependencies, with fixes.