Init wrapper : fixed some issues