Fix module references?