More Cross-Platform fixes.