Fixes w.r.t. overlapping annotations