Miscellaneous fixes and updates