Don't redefine object_id
Minor tweaks
Fix registration