Fixes for stupidity.
Merge pull request #46 from jordandukart/7.x

Fixes for stupidity.