Even more Linux build fixes