fix simple things because, damn
Merge pull request #863 from edx/ned/fix-simple-things-because,-damn

fix simple things because, damn