Fix various breakages in templates - plugin builder works again.