Non-interactive shell fixes