Keep populator order, tweak stuff