Fixes on linux