Tiny modifications to reflect templates change at beta.1