Fix resolve errors