More fixes
Merge pull request #119 from katiewood/master

More fixes