Member/single/plugin template fixes