Desktop and Tablet version fixes