Changes to make it compilable in other machines