FIXING some template issues (new FF release)