Adding in some support libraries so make_fit will compile