Buildfixes for new project.