More fixing of Linux build