Removing distribute requirement fixes some problems on my workstation
Fixed various template refs.