More fixups to resolution. Still not correct however.