Some fix
Migration to build tools 20