Fixes

Assorted fixes