Keystone template fixes