fix compilation issues
fix compilation issues
put back files