Improve and fix buildout
This refs affinitic #5575
Add ignores