Fixed types and type checks for FF6/templates