Fix up cross platform stuff