Retried without my changes and a clean build and issue seems to be gone for met. :-/ I'll revert this part.