Fix resolution problems