Misc Updates

See changelog for details.