Resolve some issues