Fixes issues with argument parsing