Update dependencies
Fix bugs