added missing ${source} prefix in some paths