andrdoid

Fixes were needed after units that were sent to reviewers back in April started having the screen peel up, or break,