Minor Core Changes