Minor cleanups, adding params to error traces