Forem fixes
Merge pull request #110 from calblueprint/sam/forem-fixes

Forem fixes