Updates to correct ISO / Template bug.