diff --git a/src/components/screens/Addressbook/index.tsx b/src/components/screens/Addressbook/index.tsx
index 94eb868e..32f3c633 100644
--- a/src/components/screens/Addressbook/index.tsx
+++ b/src/components/screens/Addressbook/index.tsx
@@ -11,7 +11,7 @@ export default function AddressbookPage({ navigation, route }: TAddressBookPageP
 	const { color } = useContext(ThemeContext)
 	return (
 		<View style={[styles.container, { backgroundColor: color.BACKGROUND }]}>
-			<TopNav screenName='Address book' />
+			<TopNav screenName='Address book' nav={{ navigation, route }} />
 			<AddressBook nav={{ navigation, route }} />
 			<BottomNav navigation={navigation} route={route} />
 		</View>
diff --git a/src/components/screens/Lightning/pageContent.tsx b/src/components/screens/Lightning/pageContent.tsx
index dce4d0b6..b6d98077 100644
--- a/src/components/screens/Lightning/pageContent.tsx
+++ b/src/components/screens/Lightning/pageContent.tsx
@@ -112,7 +112,7 @@ export default function LNPageContent({
 							placeholder='0'
 							placeholderTextColor={hi[highlight]}
 							style={[styles.amount, { color: hi[highlight] }]}
-							autoFocus={isSendingToken}
+							autoFocus
 							caretHidden
 							onChangeText={amount => setAmount(cleanUpNumericStr(amount))}
 							value={amount}
diff --git a/src/components/screens/Settings/index.tsx b/src/components/screens/Settings/index.tsx
index cfda5cb7..e0c6f7c1 100644
--- a/src/components/screens/Settings/index.tsx
+++ b/src/components/screens/Settings/index.tsx
@@ -29,7 +29,7 @@ export default function Settings({ navigation, route }: TSettingsPageProps) {
 	}
 	return (
 		<View style={[styles.container, { backgroundColor: color.BACKGROUND }]}>
-			<TopNav screenName='Settings' />
+			<TopNav screenName='Settings' nav={{ navigation, route }} />
 			<View style={[globals(color).wrapContainer, styles.wrap]}>
 				<SettingsMenuItem
 					txt='Security'
diff --git a/test/components/AddressBook.test.tsx b/test/components/AddressBook.test.tsx
index 50bd4c73..2065ce2c 100644
--- a/test/components/AddressBook.test.tsx
+++ b/test/components/AddressBook.test.tsx
@@ -1,9 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import AddressBook from '@comps/screens/Addressbook/Book'
-import AddressbookModal from '@comps/screens/Addressbook/modal'
-import { l } from '@src/logger'
+import { l } from '@log'
+import AddressBook from '@screens/Addressbook/Book'
+import AddressbookModal from '@screens/Addressbook/modal'
 import { act, fireEvent, render, screen } from '@testing-library/react-native'
 
 jest.useFakeTimers()
diff --git a/test/components/Balance.test.tsx b/test/components/Balance.test.tsx
index 46e5169d..5292fb54 100644
--- a/test/components/Balance.test.tsx
+++ b/test/components/Balance.test.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import Balance from '@comps/Balance'
-import { initDb } from '@src/storage/db'
+import { initDb } from '@db'
 import { fireEvent, render, screen } from '@testing-library/react-native'
 
 describe('Basic test of the Txt.tsx component', () => {
diff --git a/test/components/CoinSelectionModal.test.tsx b/test/components/CoinSelectionModal.test.tsx
index 74dc0a5a..a4331465 100644
--- a/test/components/CoinSelectionModal.test.tsx
+++ b/test/components/CoinSelectionModal.test.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
+import { l } from '@log'
 import { CoinSelectionModal } from '@screens/Lightning/modal'
-import { l } from '@src/logger'
 import { render, screen } from '@testing-library/react-native'
 
 describe('Basic styling test of the CoinSelectionModal component', () => {