minor fixes w.r.t. feedback