more buildfixes