A few more metacov clean ups