Fixes on Linux & one more review