- More compatibility fixes, including #242