More bugfixes!
Merge