Fixes for linux 32