equipment-some fixes