Fixed errors with command / argument parsing functions