Misc fixes

Lots of misc fixes/updates.