Core pr 6

Minor fixes.