Updates to fix HLS issues.