Another batch of coverifix