GTNPORTAL-3127 Minor modularity fixes