More bugfixes build