Modifications for good compilation under linux