Minor Fixes for Live