KC-914 Fixes for bash argument parsing