ON_Kingston 401 improvements