Minor cleanup

brickoderequested to merge
(removed):hotfixes into pregmod-master

Last one before I start working on the Nursery for real again.

Merge request reports