fixed some module reference issues.