Fix struct alignment issues and missing fields