Fix struct inits