some small bug fixes

3 jobs for !70 with f43-darktheme in 1 minute and 11 seconds (queued for 3 seconds)
merge request