A few more relative paths, fix reference to component
last path fix