Alert and tablet fixes