A last round of error cleanup.