Resolve errors