Fix issues preventing build on Linux