A few more fixes
We did gladly implement.
The build passes close-by