Fixed few things in the Linux build