Fixed minor template issues