diff --git a/src/activities/home/MyLibraryActivity.cpp b/src/activities/home/MyLibraryActivity.cpp
index 78d7bf3..ebe3e86 100644
--- a/src/activities/home/MyLibraryActivity.cpp
+++ b/src/activities/home/MyLibraryActivity.cpp
@@ -156,7 +156,7 @@ void MyLibraryActivity::loadBookmarkedBooks() {
   // Try to get better metadata from recent books
   for (auto& book : bookmarkedBooks) {
     auto it = std::find_if(recentBooks.begin(), recentBooks.end(),
-                           [&book](const RecentBooksStore::RecentBook& recent) { return recent.path == book.path; });
+                           [&book](const RecentBook& recent) { return recent.path == book.path; });
     if (it != recentBooks.end()) {
       if (!it->title.empty()) book.title = it->title;
       if (!it->author.empty()) book.author = it->author;
@@ -208,7 +208,7 @@ void MyLibraryActivity::loadAllBooks() {
           
           // Try to get metadata from recent books if available
           auto it = std::find_if(recentBooks.begin(), recentBooks.end(),
-                                 [&fullPath](const RecentBooksStore::RecentBook& recent) { return recent.path == fullPath; });
+                                 [&fullPath](const RecentBook& recent) { return recent.path == fullPath; });
           if (it != recentBooks.end()) {
             if (!it->title.empty()) result.title = it->title;
             if (!it->author.empty()) result.author = it->author;
diff --git a/src/activities/reader/EpubReaderActivity.cpp b/src/activities/reader/EpubReaderActivity.cpp
index ab95efa..426a836 100644
--- a/src/activities/reader/EpubReaderActivity.cpp
+++ b/src/activities/reader/EpubReaderActivity.cpp
@@ -386,6 +386,8 @@ void EpubReaderActivity::loop() {
         [this](QuickMenuAction action) {
           // Cache values before exitActivity
           EpubReaderActivity* self = this;
+          GfxRenderer& cachedRenderer = renderer;
+          MappedInputManager& cachedMappedInput = mappedInput;
           const Section* cachedSection = section.get();
           SemaphoreHandle_t cachedMutex = renderingMutex;