Bugfixes + logging in strategy collector
Merge commit '29144bfae967f54ffb7398f5a32a805f2cafe5e6' into separate-compilation-bootstrap