Fix some IDs