Fix some of the alignment issues in previous commit