Fixes for Linux builds