Merging fixes to live.