Fix a few path and username issues