Improved common shell stuff