Bug fixes in argument handling.