More buildfixes, WIP