More thorough handling of HGL layer activation