Resolve some errors