Fix problems on linux machine