More minor bugfixes - argv handling