small fixes
Merge pull request #1179 from edx/e0d/xqw-bugs

small fixes