Fix alignment bugs.