Update repair and some play/stop modifications