Small updates cleanerrors