Fixes modularization errors