More portability tweaks.
More portability tweaks.
Fix compiler warnings.