More work on v7 compat