Improved path shortcuts