IBT: Fixes for command line parsing