Init improvements