Distmaker fixes for 4.5