Fix some high impact defects.