(Hopefuly) fix issues introduced in r370100. This commit consists of area51 revisions 10357, 10359 and 10360. Approved by: rakuco (mentor)