handful of alignment fixes
Merge pull request #2457 from awesomerobot/master

handful of alignment fixes