Fix deploy and non-interactive shell command