Spacing changes and fixing warnings