Linux fixes ! Now works on linux too