Fixes for linux builds (x86_64)