ARMORY-180 - Fixed a few bug reports by helgabutters