MOAR cross platform fixes...