Fixed capture screen issues