Fixes for argument parsing