Feature #1224: Minor edits