Some vault improvements