Misc updates

---