oops more fixes for Linux build