shell fixup