Forgot to change two struct initializers