Fix some spacing issues