Core pr 5

Minor fixes.
I see that. Why is this necessary?