More work to v7 compat