I've stopped carrying a GI-style entrenching tool and gotten the Cold Steel non-folding version. It works a treat for small jobs.