Some more removal of errors