Change timeouts to ms
Roll 2.0.0