Adjust a couple of spacing issues