vee2 [fixing some bugs related to API for release preparation]