Changes for fix errors compiling