included parse_status branch fixes