Selfish resolution fixes