Minor distribution fixes