Fixes.
Modules setup.