Fix some 500 errors