Misc

Misc updates