more cu armor fixes