Changes to allow to work better with linux