Core pr 6

Minor fixes from last review.