changes for 5.5

Hi,

Here are the modifications I made for 5.5 compilation
Why diststuff twice?