Small edits based on review that I forgot to commit!