portability tweaks