Fixes for live_forward

1 job for master in 5 minutes and 6 seconds