Minor changes to make make dist work correctly.