Fixed 'make dist' build issues