Template classes fixed.