Finish adding timeouts to core and API