Wollie fixes

Denk ik. Who knows?
Merge conflicts again