Hlafteraction bug fixes
Merge origin/master