Better shell magic for maintenance