Updates for Linux build