Backwards compatibility fixes
Merge pull request #1345 from lukearmstrong/patch-1

Backwards compatibility fixes