Fix hl-modules too