-reapir some errors