Updated RPATH support