HLS issues fixed