fix some alignment issues