Build fix hackery