Build fix attempt