Add a few minor fixes for modules/clinker on linux;
Add minor changes