Miscellaneous small edits