Use a non-interactive, non-login shell
Fix wrong comment
Restore hi2 configuration