Resolve some mistakes