rpath improvements