modularity fixes