Merge miscellaneous fixes into development