Make sure 'make dist' works properly, minor whitespace fixes