Misc. edits