Simplify the paths and fix a typo
Fix a minor bug