Resolving some screen conflicts