Fixed small init bugs