I'll take a look at the first one ... The second one I can definitely fix for the next release.