More lime compat updates