Fix spacing and other warnings