More alignment-related fixes.