Small edits to be ready for merge