Fixes needed on Linux