More Shell ID Fixes