Fix a few problems with relative paths