Fix a few path bugs