Some init changes