New tries at bugfixes