First wave of changes for iPad compatibility