Fixed fabric helper commands