Init / reinit improvements