Two norse fixes
Merge pull request #46 from bnormoyle/2.2.0.2-stability

Two norse fixes