fix paths, headers