Update rpath handling