Fixed timeouts on connect and invalid move