Minor edits to Core