Bugfixes for iphone + stafslide repair