Fix some spacing details