Fixed some compatibility issues
0.3.1