fixes of sink module implementation