Fixes for iDevice