Couple of small fixes, works again with new ID code.