Some more fixes for armet