Compatibility fixes
Merge pull request #1 from shak-mar/fixes

Compatibility fixes