Misc minor edits