Fix 500 errors