Fix non interactive shells