Tiny Cross-platform fixes.