Fixed module reference issues