Moar armalis fixes