Fix for v0.5.4 issues

[rebelinux]

Description

[0.5.4] - Unreleased

Fixed

• Fix #25
• Fix #26

Related Issue

Motivation and Context

• Fix annoying issues

How Has This Been Tested?

• Homelab

Screenshots (if appropriate):

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have read the CONTRIBUTING document.