Add some tricks for fixing init