Bugfixes on the way to enabling