Fixing logger issue
Fixing template builder CS issues