Fix some more reported bugs.
Merge pull request #999 from sylus/7.x-1.x

Fix some more reported bugs.