Even more bugfixes
Merge branch 'testing'