diff --git a/applications/plugins/blackjack/common/card.c b/applications/plugins/blackjack/common/card.c
index 955866442..199135bb5 100644
--- a/applications/plugins/blackjack/common/card.c
+++ b/applications/plugins/blackjack/common/card.c
@@ -127,11 +127,14 @@ void draw_card_back_at(int8_t pos_x, int8_t pos_y, Canvas* const canvas) {
 
 void generate_deck(Deck* deck_ptr, uint8_t deck_count) {
     uint16_t counter = 0;
-    if(deck_ptr->cards == NULL) {
-        deck_ptr->deck_count = deck_count;
-        deck_ptr->card_count = deck_count * 52;
-        deck_ptr->cards = malloc(sizeof(Card) * deck_ptr->card_count);
+    if(deck_ptr->cards != NULL) {
+        free(deck_ptr->cards);
     }
+
+    deck_ptr->deck_count = deck_count;
+    deck_ptr->card_count = deck_count * 52;
+    deck_ptr->cards = malloc(sizeof(Card) * deck_ptr->card_count);
+
     for(uint8_t deck = 0; deck < deck_count; deck++) {
         for(uint8_t pip = 0; pip < 4; pip++) {
             for(uint8_t label = 0; label < 13; label++) {
diff --git a/applications/plugins/solitaire/common/card.c b/applications/plugins/solitaire/common/card.c
index 955866442..199135bb5 100644
--- a/applications/plugins/solitaire/common/card.c
+++ b/applications/plugins/solitaire/common/card.c
@@ -127,11 +127,14 @@ void draw_card_back_at(int8_t pos_x, int8_t pos_y, Canvas* const canvas) {
 
 void generate_deck(Deck* deck_ptr, uint8_t deck_count) {
     uint16_t counter = 0;
-    if(deck_ptr->cards == NULL) {
-        deck_ptr->deck_count = deck_count;
-        deck_ptr->card_count = deck_count * 52;
-        deck_ptr->cards = malloc(sizeof(Card) * deck_ptr->card_count);
+    if(deck_ptr->cards != NULL) {
+        free(deck_ptr->cards);
     }
+
+    deck_ptr->deck_count = deck_count;
+    deck_ptr->card_count = deck_count * 52;
+    deck_ptr->cards = malloc(sizeof(Card) * deck_ptr->card_count);
+
     for(uint8_t deck = 0; deck < deck_count; deck++) {
         for(uint8_t pip = 0; pip < 4; pip++) {
             for(uint8_t label = 0; label < 13; label++) {
diff --git a/applications/plugins/solitaire/solitaire.c b/applications/plugins/solitaire/solitaire.c
index 9e3bd5d8a..54d3e707e 100644
--- a/applications/plugins/solitaire/solitaire.c
+++ b/applications/plugins/solitaire/solitaire.c
@@ -7,7 +7,7 @@
 #include "Solitaire_icons.h"
 #include <notification/notification.h>
 #include <notification/notification_messages.h>
-
+void init(GameState* game_state);
 const NotificationSequence sequence_fail = {
     &message_vibro_on,
     &message_note_c4,
@@ -271,16 +271,15 @@ void tick(GameState* game_state, NotificationApp* notification) {
     uint8_t column = game_state->selectColumn;
     if(game_state->state != GameStatePlay && game_state->state != GameStateAnimate) return;
     bool wasAction = false;
-
+    if(game_state->state == GameStatePlay) {
+        if(game_state->top_cards[0].character == 11 && game_state->top_cards[1].character == 11 &&
+           game_state->top_cards[2].character == 11 && game_state->top_cards[3].character == 11) {
+            game_state->state = GameStateAnimate;
+            return;
+        }
+    }
     if(handleInput(game_state)) {
         if(game_state->state == GameStatePlay) {
-            if(game_state->top_cards[0].character == 11 &&
-               game_state->top_cards[1].character == 11 &&
-               game_state->top_cards[2].character == 11 &&
-               game_state->top_cards[3].character == 11) {
-                game_state->state = GameStateAnimate;
-                return;
-            }
             if(game_state->longPress && game_state->dragging_hand.index == 1) {
                 for(uint8_t i = 0; i < 4; i++) {
                     if(place_on_top(
@@ -365,7 +364,11 @@ void tick(GameState* game_state, NotificationApp* notification) {
         }
     }
     if(game_state->state == GameStateAnimate) {
-        if(game_state->animation.started) game_state->state = GameStateStart;
+        if(game_state->animation.started && !game_state->longPress &&
+           game_state->input == InputKeyOk) {
+            init(game_state);
+            game_state->state = GameStateStart;
+        }
 
         game_state->animation.started = true;
         if(game_state->animation.x < -20 || game_state->animation.x > 128) {
@@ -375,6 +378,7 @@ void tick(GameState* game_state, NotificationApp* notification) {
 
             if(game_state->animation.indexes[0] == 13 && game_state->animation.indexes[1] == 13 &&
                game_state->animation.indexes[2] == 13 && game_state->animation.indexes[3] == 13) {
+                init(game_state);
                 game_state->state = GameStateStart;
                 return;
             }
@@ -499,6 +503,9 @@ int32_t solitaire_app(void* p) {
                     case InputKeyOk:
                         localstate->input = event.input.key;
                         break;
+                    case InputKeyBack:
+                        processing = false;
+                        return_code = 1;
                     default:
                         break;
                     }
@@ -519,6 +526,7 @@ int32_t solitaire_app(void* p) {
                         }
                         break;
                     case InputKeyBack:
+                        init(game_state);
                         processing = false;
                         return_code = 1;
                         break;
diff --git a/applications/plugins/totp/services/cli/cli_helpers.h b/applications/plugins/totp/services/cli/cli_helpers.h
index 9b19f926b..144e19ed9 100644
--- a/applications/plugins/totp/services/cli/cli_helpers.h
+++ b/applications/plugins/totp/services/cli/cli_helpers.h
@@ -37,4 +37,11 @@
     TOTP_CLI_PRINTF(                       \
         "Invalid command arguments. use \"help\" command to get list of available commands")
 
+/**
+ * @brief Checks whether user is authenticated and entered correct PIN.
+ *        If user is not authenticated it prompts user to enter correct PIN to authenticate.
+ * @param plugin_state application state
+ * @param cli reference to the firmware CLI subsystem 
+ * @return \c true if user is already authenticated or successfully authenticated; \c false otherwise
+ */
 bool totp_cli_ensure_authenticated(const PluginState* plugin_state, Cli* cli);