Got rid of a couple of 500 errors for now