Only use two threads

Hopefully this will cut down on spurious failures
Fix contrib paths