Core pr 5

Minor fixes.
Fixed.