Fix fixes, get closer to resolution solution