More assorted fixes/changes