Fix issues with long keys, and over greedy relation following