Even more coverifix