AppStore release v.2.0 fixes