Fix more struct inits