Miscellaneous fixes not related to any current issues