Further updates to keystone scripts