Hlafteraction bug fixes