diff --git a/src/lib/objects/payggy/views/confirm-send.svelte b/src/lib/objects/payggy/views/confirm-send.svelte
index b1ecbd7d..64210bf6 100644
--- a/src/lib/objects/payggy/views/confirm-send.svelte
+++ b/src/lib/objects/payggy/views/confirm-send.svelte
@@ -42,7 +42,7 @@
 			fee = await estimateTransaction(toUser.address, tokenToTransfer)
 		} catch (e) {
 			addError({
-				title: 'Blockchain error',
+				title: 'Payggy error',
 				message: `Failed to estimate transaction fee. ${(e as Error).message}`,
 				retry: tryEstimateTransaction,
 				ok: true,
@@ -55,7 +55,7 @@
 	async function sendTransactionInternal() {
 		if (!fee) {
 			addError({
-				title: 'Blockchain error',
+				title: 'Payggy error',
 				message: 'No estimated transaction fee.',
 				ok: true,
 			})
@@ -73,7 +73,7 @@
 			exitObject()
 		} catch (error) {
 			addError({
-				title: 'Error',
+				title: 'Payggy Error',
 				message: `Failed to send transaction. ${(error as Error).message}`,
 				retry: sendTransactionInternal,
 				ok: true,
diff --git a/src/lib/objects/split/chat-messages/settle-reminder.svelte b/src/lib/objects/split/chat-messages/settle-reminder.svelte
index f169ba33..14052dbd 100644
--- a/src/lib/objects/split/chat-messages/settle-reminder.svelte
+++ b/src/lib/objects/split/chat-messages/settle-reminder.svelte
@@ -19,7 +19,7 @@
 
 	export let onViewChange: (view: View, ...rest: string[]) => void
 
-	let owedAmount = BigInt(0)
+	let owedAmount = 0n
 	$: {
 		const balance = balances.find(({ address }) => address === profile.address)
 		if (balance) {
diff --git a/src/lib/objects/split/views/choose-images.svelte b/src/lib/objects/split/views/choose-images.svelte
index c6ddc0c3..2f9a238d 100644
--- a/src/lib/objects/split/views/choose-images.svelte
+++ b/src/lib/objects/split/views/choose-images.svelte
@@ -16,6 +16,7 @@
 	import Add from '$lib/components/icons/add.svelte'
 	import TrashCan from '$lib/components/icons/trash-can.svelte'
 	import { errorStore } from '$lib/stores/error'
+	import Loading from '$lib/components/loading.svelte'
 
 	export let images: string[]
 	export let exitObject: () => void
@@ -33,7 +34,7 @@
 		} catch (error) {
 			// Here the retry functionality is not really that straight forward so we ask user to reupload if they want to.
 			errorStore.addEnd({
-				title: 'Upload error',
+				title: 'Splitter error',
 				message: `Failed to upload image ${image.name}. Please try and add it again. ${
 					(error as Error)?.message
 				}`,
@@ -86,6 +87,9 @@
 			<InputFile multiple bind:files size={128} borderRadius={12} margin="none">
 				<Add size={32} />
 			</InputFile>
+			{#if uploading}
+				<Loading />
+			{/if}
 			{#each images as image}
 				<Image picture={image}>
 					<Button variant="icon" on:click={() => removeImage(image)}><TrashCan /></Button>
diff --git a/src/lib/objects/split/views/settle-now.svelte b/src/lib/objects/split/views/settle-now.svelte
index dba7306e..8f3bdab4 100644
--- a/src/lib/objects/split/views/settle-now.svelte
+++ b/src/lib/objects/split/views/settle-now.svelte
@@ -47,7 +47,7 @@
 			owedAmount = await getOwedAmount(getContract, splitterAddress, profile.address)
 		} catch (error) {
 			addError({
-				title: 'Blockchain error',
+				title: 'Splitter error',
 				message: `Failed to retrieve owed amount. ${(error as Error).message}`,
 				retry: tryGetOwedAmount,
 			})
@@ -63,7 +63,7 @@
 		} catch (error) {
 			feeError = error as Error
 			addError({
-				title: 'Blockchain error',
+				title: 'Splitter error',
 				message: `Failed to estimate fee ${feeError?.message}`,
 				retry: tryEstimateSettleDebt,
 			})
diff --git a/src/lib/objects/split/views/summary.svelte b/src/lib/objects/split/views/summary.svelte
index 0d93a6db..0886354e 100644
--- a/src/lib/objects/split/views/summary.svelte
+++ b/src/lib/objects/split/views/summary.svelte
@@ -64,7 +64,7 @@
 			)
 		} catch (error) {
 			addError({
-				title: 'Blockchain error',
+				title: 'Splitter error',
 				message: `Failed to estimate gas fee. ${(error as Error)?.message}`,
 				ok: true,
 				retry: () => tryEstimateFee(users, amount, token),
@@ -110,7 +110,7 @@
 			exitObject()
 		} catch (error) {
 			addError({
-				title: 'Blockchain error',
+				title: 'Splitter error',
 				message: `Failed to send transaction. ${(error as Error)?.message}`,
 				ok: true,
 				retry: sendTransactionInternal,