Better monitor handling