resolved some warnings after sync (double define)