Resolve mistakes