Buildfixes part 2