Fix spacing problems