Source mint removal and module fixes