More bugfixes. Still different result from slow and fast