Fixing cmd line parse functions.