Minor bugfixes and robustness for more edge cases

[emaguire]

No description provided.

[github-actions]

New build (#16) deployed to staging 🚧
- Test it on the staging URL: papa.amfws.staging.arg.tech
- If you update the PR or create another one, a new build will be created, replacing this one
- View build log

Note: If this PR is to main, only authorized users will be allowed to merge. Once merged to main, the build will be promoted to the production server. Ensure the staging build works correctly before merging.

[github-actions]

In progress: build being promoted to production 🏗️
- Target server: argand
- View build log

[github-actions]

Build deployed to production 🏠
- Target server: argand
- Your app's URL: papa.amfws.arg.tech
- Tip: delete the source branch, and for future work create a fresh one from main to avoid merge conflicts
- View build log