Fixed 500 errors and timeouts