Some bugfixes, but not all