Bugfixes with argument parsing.