Clean up errors a bit.