fix a few gratuitous breakages