more misc. fixes for IDs etc.