Re: Some problems found and, I hope, located.

> Hope this will be useful...

Unfortunately, you did not give a reproducer: we would need a complete set of
sources+project file in order to reproduce what you are seeing, as well
as the exact sequence of actions performed.

The build is working in general, so the changes you are suggesting at first
sight do not seem needed, so I suspect the problem is actually somewhere else,
or more subtle.

Arno