Commandline parsing improvements