Fix alignment issues