Update miscellaneous fixes