Clean up some things, add a warning about bulk-import object relation ids