[Fix] Small fixes after live test.