Upgrade dependencies
Fix a bug related to resolving "../" in some relative paths
Simplify some code