Core pr 6

Minor fixes.
I will have to send this question on to @guddo as it comes from a PR.