Final fixes for Live OC