Error polish and additional coverage