Whaddya know. More template fixes.