Fixed omitted Label and minor timeouts fixes