Bugfixes for armor recovery