Revise errors and warnings