Fix Appstore many bugs