Fix possible mismatch in baseline/trace shape

And set baseline to 200 in case it is -999...