Attempt to Better Fix Shell Compat Issues