Fix ups in parsing results from Commander