Optimizations, app store 2.0.1 ready