Problematic fixes - required follow-ups

[mihneadb]

Issue X was solved/closed, code was merged in module Y. However, there have been N follow up commits on that module after this. This means that the initial fix was not entirely correct/safe.