More Useful Shell Fixes