Minor fixes.
Merge pull request #44 from jordandukart/7.x

Minor fixes.