More compat improvements.