ARMORY-110 Last minute fixes