On branch master - clean the compiling errors