Bugfix for collator

Conflicts:
	src/persistence.cpp
Clean up