Bugs fixes for initial live test