Add some more contrib stuff, stop it importing bits of contrib that cause problems.