Minor portability tweaks