More compatibility and bug fixes.