More fixes
Merge pull request #9 from nickudell/BleedingEdge

More fixes