Final fix for armory, you can compile now :)