Small armor bug fixes.