Fix nasty struct alignment problem