Core: More minor edits