Fix keystone_* blocks