Fix some 500s