fix paths, include missing components