Feature/smaller cleanups

as the title suggests, these are a couple of smaller fixes, which are not directly related and aren't important enough to manage them in separate branches.