Assorted fixes.