Fixes from live test