Template specialization and corrections