Fix problems with Modulefile etc.