More fixes
Merge pull request #120 from katiewood/master

More fixes