Small ordering template changes