Patching compatibility
I missed these
Merge pull request #1157 from TheTemportalist/master

More fixes?