Little fixes in Screen*