fix paths, etc