Fixing some resolution issues