Bugfixes in -n and other arguments