Fixed timeouts

Signed-off-by: Daniel Koo <danieljamin.koo@gmail.com>