Some minor updates to mojos and templates