04-2 fixes
Template problems