More bugfixes plus a workarround