Merge "More HLS fixes"