Fix build by import of version 0.2.1.0
Fix examples build