Coverage fixes