Improved and simplified rpath