More fixes.
Merge branch 'master' of github.com:PatrickNiedzielski/fb-hackathon-2013-11-21