assorted fixes