Fixing more relative paths