Redid the fixes our "programmers" deleted when being stupid