Fixes for the Linux client build