Fixes for armor and other things