keystone template fixes