More tuning of module references