SLT-275 Fixing modularity breaches and encapsulation dismissals