some further fixes regarding the Linux build