Misc Updates

Nothing really specific.