Misc updates

Misc updates