Improved shell utils