Tiny fixes on linux end