Fix bugs related the support library v18