Minor improvements

Hi!

Several minor improvements and fixes for the bugs reported by the community in the past weeks.

May you all have a nice weekend!

Sincerely,
Bone Collectors.