Some resolution fixes