Update to latest

Misc updates