Fold in the last-minute fixes (0.4.5)