Fixed some alignment issues (based on a patch by Gregg Mattinson).