Build fixes
Merge pull request #1 from mdr/DealingWithMutability

Build fixes