Extra fixes to secure Gamma armory