Miscellaneous fixes per code review