Potential build OOM fix

This relates only to build & testsuite