Hopefully fixed last of the Linux compile errors