various template project fixes