Last fixes for store release.