Resolution fixes