Actually fixed github build issues