Even more failed bugfixes