Fix Module building