Allow collections to maintain their own ids and other small fixes