Linux build fix

Other misc changes